From: Katsumi Yamaoka <katsumi@flagship2>
Date: Sat, 12 Jun 2010 11:47:36 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~31
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5981ed601504a8c2ea67db72d850f19d87f00374;p=emacs.git

Merge from mainline.
---

5981ed601504a8c2ea67db72d850f19d87f00374